merge emacs-24
authorKenichi Handa <handa@gnu.org>
Tue, 27 Nov 2012 13:02:06 +0000 (22:02 +0900)
committerKenichi Handa <handa@gnu.org>
Tue, 27 Nov 2012 13:02:06 +0000 (22:02 +0900)
commit7d7fc24e1229e59048077ce698eddbd5355215f9
tree9f58e8791a696847aba24f549e84531d3fbe2364
parent34bbf627e3fcf0b15a8cd56ee8c0c15d5c9679a9
parent30d1155d5c1b7d03814388a75b616d60ce004102
merge emacs-24